Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[action] [PR:14652] [Mellanox] Facilitate automatic integration of sdk kernel patches #15732

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

mssonicbld
Copy link
Collaborator

Why I did it

Facilitate Automatic integration of sdk kernel patches into SONiC.

Inputs to the Script:

  1. MLNX_SDK_VERSION Eg: 4.5.4206
  2. MLNX_SDK_ISSU_VERSION Eg: 101
    Note: If nothing is provided the one already present in the sdk.mk file is used
  3. MLNX_SDK_SOURCE_BASE_URL:
    Note: If nothing is provided the upstream sdk drivers url is used
  4. CREATE_BRANCH: (y|n) Creates a branch instead of a commit (optional, default: n)
  5. BRANCH_SONIC: Only relevant when CREATE_BRANCH is y. Default: master.

Note: These should be provided through SONIC_OVERRIDE_BUILD_VARS parameter

Output:

  1. Script creates a commit in sonic-linux-kernel with any updates to sdk-kernel patches in sonic in accordance with the version provided by MLNX_SDK_VERSION

Note: Script Doesn't commit anything to linux-kernel when there aren't any changes required..

How I did it

  1. Added a new make target which can be invoked by calling make integrate-mlnx-sdk
user@server:/sonic-buildimage/src/sonic-linux-kernel$ git rev-parse --abbrev-ref HEAD
master_6f38dca_integrate_4.5.4206

user@server:/sonic-buildimage/src/sonic-linux-kernel$ git log --oneline -n 1
d64d1e7 (HEAD -> master_6f38dca_integrate_4.5.4206) Intgerate MLNX SDK 4.5.4206 Kernel Patches

Changes made will be summarized under sonic-buildimage/integrate-mlnx-sdk_user.out file. Debugging and troubleshooting output is written to sonic-buildimage/integrate-mlnx-sdk.log files

log_files.zip

Limitations:

  1. Assumes that the sdk kernel patches are always upstreamed

How to verify it

Build the Kernel and test

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

…nic-net#14652)

#### Why I did it

Facilitate Automatic integration of sdk kernel patches into SONiC. 

**Inputs to the Script:**
1) `MLNX_SDK_VERSION` Eg: `4.5.4206`
2) `MLNX_SDK_ISSU_VERSION` Eg: `101` 
 **Note: If nothing is provided the one already present in the sdk.mk file is used**
3) `MLNX_SDK_SOURCE_BASE_URL:` 
 **Note: If nothing is provided the upstream sdk drivers url is used**
4) `CREATE_BRANCH: (y|n)` Creates a branch instead of a commit (optional, default: n) 
5) `BRANCH_SONIC`:  Only relevant when CREATE_BRANCH is y. `Default: master`. 

Note: These should be provided through `SONIC_OVERRIDE_BUILD_VARS ` parameter

**Output:**
1) Script creates a commit in sonic-linux-kernel with any updates to sdk-kernel patches in sonic in accordance with the version provided by  `MLNX_SDK_VERSION`

**Note: Script Doesn't commit anything to linux-kernel when there aren't any changes required..**  

#### How I did it

1) Added a new make target which can be invoked by calling `make integrate-mlnx-sdk`

```
user@server:/sonic-buildimage/src/sonic-linux-kernel$ git rev-parse --abbrev-ref HEAD
master_6f38dca_integrate_4.5.4206

user@server:/sonic-buildimage/src/sonic-linux-kernel$ git log --oneline -n 1
d64d1e7 (HEAD -> master_6f38dca_integrate_4.5.4206) Intgerate MLNX SDK 4.5.4206 Kernel Patches
```

Changes made will be summarized under `sonic-buildimage/integrate-mlnx-sdk_user.out` file. Debugging and troubleshooting output is written to `sonic-buildimage/integrate-mlnx-sdk.log` files

[log_files.zip](https://github.com/sonic-net/sonic-buildimage/files/11226441/log_files.zip)


#### Limitations:
1) Assumes that the sdk kernel patches are always upstreamed

#### How to verify it

Build the Kernel and test
@mssonicbld
Copy link
Collaborator Author

Original PR: #14652

@mssonicbld mssonicbld merged commit 28857e3 into sonic-net:202211 Jul 6, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants